Add dicomdictpath differently

diff --git a/CMake/dcmtkMacros.cmake b/CMake/dcmtkMacros.cmake
index a14d1a811d971136d7dc2691dbc8ae244870cc5d..1be07e9912a20ce1489abaeca5de102ccd28b605 100644 (file)
--- a/CMake/dcmtkMacros.cmake
+++ b/CMake/dcmtkMacros.cmake
@@ -55,11 +55,11 @@ MACRO(DCMTK_ADD_EXECUTABLE PROGRAM)
         ENDIF(WIN32 AND NOT MINGW)
 
         # Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property
-        SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
+#        SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
 
         # declare installation files, also export DCMTKTargets.cmake
         INSTALL(TARGETS ${PROGRAM}
-                EXPORT DCMTKTargets
+#                EXPORT DCMTKTargets
                 COMPONENT bin
                 DESTINATION ${DCMTK_INSTALL_BINDIR})
     ENDIF(BUILD_APPS)

diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake
index 54ebdb58701fe966e8f99ea3e5133488183dd042..49233ebf1008ddb949fd0869c02c4563f4efb7e4 100644 (file)
--- a/CMake/dcmtkPrepare.cmake
+++ b/CMake/dcmtkPrepare.cmake
@@ -56,7 +56,7 @@ SET(DCMTK_PACKAGE_VERSION_SUFFIX "")
 #SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/")
 
 # Shared library version information
-SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}")
+SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}.abi2" SOVERSION "${DCMTK_ABI_VERSION}")
 
 # General build options and settings
 OPTION(BUILD_APPS "Build command line applications and test programs." ON)

diff --git a/CMake/osconfig.h.in b/CMake/osconfig.h.in
index 2b6325d8f0b7952f8f5f1879186ffe7578ca08e2..1b0943a8a45a86e079459272576c05fe03caa47f 100644 (file)
--- a/CMake/osconfig.h.in
+++ b/CMake/osconfig.h.in
@@ -1132,4 +1132,16 @@ typedef unsigned long ulong;
 /* The path on the Android device that should be used for temporary files */
 #cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@"
 
+/* Define if the compiler supports __alignof__ */
+#cmakedefine HAVE_GNU_ALIGNOF
+
+/* Define if the compiler supports __alignof */
+#cmakedefine HAVE_MS_ALIGNOF
+
+/* Define if the compiler supports __attribute__(aligned) */
+#cmakedefine HAVE_ATTRIBUTE_ALIGNED
+
+/* Define if the compiler supports __declspec(align) */
+#cmakedefine HAVE_DECLSPEC_ALIGN
+
 #endif /* !OSCONFIG_H*/

diff --git a/config/aclocal.m4 b/config/aclocal.m4
index 78e457e1601b7bba99026dc6a6e6aad23c8193f3..80bffb8d26f95c7f1daff2dc0c9c385ab001ab2a 100644 (file)
--- a/config/aclocal.m4
+++ b/config/aclocal.m4
@@ -1490,6 +1490,47 @@ else
 fi
 ])
 
+AC_DEFUN([AC_CHECK_ALIGNOF],
+[
+    AC_MSG_CHECKING([for __alignof__])
+    AC_LINK_IFELSE(
+    [
+        AC_LANG_SOURCE(
+        [
+            int main(){char c[__alignof__(int)];return 0;}
+        ])
+    ],
+    [dcmtk_have_alignof=[yes]],
+    [dcmtk_have_alignof=[no]]
+    )
+    if test "$dcmtk_have_alignof" = yes; then
+        AC_MSG_RESULT([yes])
+        AC_DEFINE($1,[1],[Define if __alignof__ is available])
+    else
+        AC_MSG_RESULT([no])
+    fi
+])
+
+AC_DEFUN([AC_CHECK_ATTRIBUTE_ALIGNED],
+[
+    AC_MSG_CHECKING([for __attribute__((aligned))])
+    AC_LINK_IFELSE(
+    [
+        AC_LANG_SOURCE(
+        [
+            int main(){__attribute__((aligned(4))) char c[16];return 0;}
+        ])
+    ],
+    [dcmtk_have_attribute_aligned=[yes]],
+    [dcmtk_have_attribute_aligned=[no]]
+    )
+    if test "$dcmtk_have_attribute_aligned" = yes; then
+        AC_MSG_RESULT([yes])
+        AC_DEFINE($1,[1],[Define if __attribute__((aligned)) is available])
+    else
+        AC_MSG_RESULT([no])
+    fi
+])
 
 dnl
 dnl CHECK_VLA checks if the C Compiler supports variable-length arrays

diff --git a/config/configure b/config/configure
index a5d0bd5aae6b0f043a4456bde21ede4f121214a8..c8970403f86b21b9fda797d74059ad38d5180566 100755 (executable)
--- a/config/configure
+++ b/config/configure
@@ -15001,6 +15001,66 @@ $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __alignof__" >&5
+$as_echo_n "checking for __alignof__... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+            int main(){char c__alignof__(int);return 0;}
+
+
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  dcmtk_have_alignof=yes
+else
+  dcmtk_have_alignof=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    if test "$dcmtk_have_alignof" = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_GNU_ALIGNOF 1" >>confdefs.h
+
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((aligned))" >&5
+$as_echo_n "checking for __attribute__((aligned))... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+            int main(){__attribute__((aligned(4))) char c16;return 0;}
+
+
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  dcmtk_have_attribute_aligned=yes
+else
+  dcmtk_have_attribute_aligned=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    if test "$dcmtk_have_attribute_aligned" = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
+
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+
+
 CFLAGS="$DEBUGCFLAGS $CFLAGS"
 CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS"
 

diff --git a/config/include/dcmtk/config/osconfig.h.in b/config/include/dcmtk/config/osconfig.h.in
index 0b7399b2d8df51b8d806320ba9d8eeb178f2cbc1..80e9884c837e6120bf1e1b2483cd41977d13e168 100644 (file)
--- a/config/include/dcmtk/config/osconfig.h.in
+++ b/config/include/dcmtk/config/osconfig.h.in
@@ -91,6 +91,9 @@
 /* Define if __attribute__((aligned)) is available */
 #undef HAVE_ATTRIBUTE_ALIGNED
 
+/* Define if __attribute__((aligned)) is available */
+#undef HAVE_ATTRIBUTE_ALIGNED
+
 /* Define to 1 if you have the `bcmp' function. */
 #undef HAVE_BCMP
 
@@ -286,6 +289,9 @@
 /* Define if __alignof__ is available */
 #undef HAVE_GNU_ALIGNOF
 
+/* Define if __alignof__ is available */
+#undef HAVE_GNU_ALIGNOF
+
 /* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H
 

diff --git a/dcmdata/data/CMakeLists.txt b/dcmdata/data/CMakeLists.txt
index 976506b7556b9b802dd8397f041364dd3cb04822..e3361ae37bbc078f7d037f6e93a10d553c407ff2 100644 (file)
--- a/dcmdata/data/CMakeLists.txt
+++ b/dcmdata/data/CMakeLists.txt
@@ -1,2 +1,3 @@
 # declare installation files
-INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
+INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
+INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)

diff --git a/dcmjpls/CMakeLists.txt b/dcmjpls/CMakeLists.txt
index e114663776f0e1654d6fddbc3316ffd5e8b6725b..c92ac5bf41ba1281e012bb8fccf6b289b3a19d54 100644 (file)
--- a/dcmjpls/CMakeLists.txt
+++ b/dcmjpls/CMakeLists.txt
@@ -2,6 +2,6 @@
 PROJECT(dcmjpls)
 
 # recurse into subdirectories
-FOREACH(SUBDIR libsrc libcharls apps include)
+FOREACH(SUBDIR libsrc apps include)
   ADD_SUBDIRECTORY(${SUBDIR})
 ENDFOREACH(SUBDIR)

diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt
index 2e881d72b79cb34e2a7f17db96bf53f70b5704ff..8d7bcc32960e44bb21746fbf54d8c3aed3ab76ab 100644 (file)
--- a/dcmjpls/apps/CMakeLists.txt
+++ b/dcmjpls/apps/CMakeLists.txt
@@ -8,5 +8,5 @@ ENDFOREACH(PROGRAM)
 
 # make sure executables are linked to the corresponding libraries
 FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
-  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
+  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd)
 ENDFOREACH(PROGRAM)

diff --git a/dcmjpls/libcharls/CMakeLists.txt b/dcmjpls/libcharls/CMakeLists.txt
index 99371f70c84ac2be012bb9323234efe87813d694..1f1ee75f9e5f024627ffb6e0201f9c8af11ec444 100644 (file)
--- a/dcmjpls/libcharls/CMakeLists.txt
+++ b/dcmjpls/libcharls/CMakeLists.txt
@@ -1,5 +1,5 @@
 # declare additional include directories
-INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/libcharls ${ofstd_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(${ofstd_SOURCE_DIR}/include)
 
 # create library from source files
 DCMTK_ADD_LIBRARY(charls header intrface jpegls)

diff --git a/dcmjpls/libsrc/CMakeLists.txt b/dcmjpls/libsrc/CMakeLists.txt
index 8a7b4e89fa883d98e805dfbb0b41aa59e52d1aa2..40d46631ba87ecbd8ec7c3d67a3a0c99e6fedc57 100644 (file)
--- a/dcmjpls/libsrc/CMakeLists.txt
+++ b/dcmjpls/libsrc/CMakeLists.txt
@@ -1,7 +1,7 @@
 # declare additional include directories
-INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR})
+INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${ZLIB_INCDIR})
 
 # create library from source files
 DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
 
-DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
+DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS)

diff --git a/dcmjpls/libsrc/djcodecd.cc b/dcmjpls/libsrc/djcodecd.cc
index a6c0c6fe42faab7fd5d5cd8f6cd420d5e967826c..bea4f619dc5d50e1f3c4be0bdd8278798fd97eb0 100644 (file)
--- a/dcmjpls/libsrc/djcodecd.cc
+++ b/dcmjpls/libsrc/djcodecd.cc
@@ -37,7 +37,7 @@
 #include "djerror.h"                 /* for private class DJLSError */
 
 // JPEG-LS library (CharLS) includes
-#include "intrface.h"
+#include "CharLS/interface.h"
 
 E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
 {

diff --git a/dcmjpls/libsrc/djcodece.cc b/dcmjpls/libsrc/djcodece.cc
index 261fec82ee451082b2094e92590e0470333e6ed1..970dd0354857a93d153c4021b886b027311f1809 100644 (file)
--- a/dcmjpls/libsrc/djcodece.cc
+++ b/dcmjpls/libsrc/djcodece.cc
@@ -55,7 +55,7 @@
 #include "dcmtk/dcmimgle/dcmimage.h"  /* for class DicomImage */
 
 // JPEG-LS library (CharLS) includes
-#include "intrface.h"
+#include "CharLS/interface.h"
 
 BEGIN_EXTERN_C
 #ifdef HAVE_FCNTL_H

diff --git a/dcmjpls/libsrc/djerror.h b/dcmjpls/libsrc/djerror.h
index d625c48a69fe1f5813c24f3932e68553f2ae67d1..4f5c670023c3bb4a811c4084f21a629499fa4f45 100644 (file)
--- a/dcmjpls/libsrc/djerror.h
+++ b/dcmjpls/libsrc/djerror.h
@@ -24,7 +24,7 @@
 
 #include "dcmtk/config/osconfig.h"
 #include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */
-#include "intrface.h" /* CharLS include */
+#include "CharLS/interface.h" /* CharLS include */
 
 /** Helper class for converting between dcmjpls and CharLS error codes
  */

diff --git a/dcmnet/libsrc/dul.cc b/dcmnet/libsrc/dul.cc
index 434681a1d289c1617bfbd862af4e49956c3d876c..91ee72619ff1ede40bdfe92eb831cca3aa29800d 100644 (file)
--- a/dcmnet/libsrc/dul.cc
+++ b/dcmnet/libsrc/dul.cc
@@ -1833,7 +1833,7 @@ receiveTransportConnectionTCP(PRIVATE_NETWORKKEY ** network,
         return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
     }
 #endif
-    setTCPBufferLength(sock);
+    //setTCPBufferLength(sock);
 
 #ifndef DONT_DISABLE_NAGLE_ALGORITHM
     /*

diff --git a/dcmnet/libsrc/dulfsm.cc b/dcmnet/libsrc/dulfsm.cc
index edf7f30d3aadb275e51ef1785f2254a159bfbae4..5d9719778722ec1dfc1277b75c800350474cbf30 100644 (file)
--- a/dcmnet/libsrc/dulfsm.cc
+++ b/dcmnet/libsrc/dulfsm.cc
@@ -2421,7 +2421,7 @@ requestAssociationTCP(PRIVATE_NETWORKKEY ** network,
           return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
         }
 #endif
-        setTCPBufferLength(s);
+        //setTCPBufferLength(s);
 
 #ifndef DONT_DISABLE_NAGLE_ALGORITHM
         /*

diff --git a/dcmqrdb/docs/dcmqrcnf.txt b/dcmqrdb/docs/dcmqrcnf.txt
index 0ff2daeb0f37602ba37dcf9554fb6904f3975817..9f579d33115084e0e2eb70514007889bf190b528 100644 (file)
--- a/dcmqrdb/docs/dcmqrcnf.txt
+++ b/dcmqrdb/docs/dcmqrcnf.txt
@@ -44,8 +44,8 @@ Example:
 NetworkTCPPort  = 104
 MaxPDUSize      = 8192
 MaxAssociations = 20
-UserName        = (do not change user)
-GroupName       = (do not change group)
+UserName        = "dcmtk"
+GroupName       = "dcmtk"
 
 NOTE: You must have root privileges to bind port 104 for DICOM association 
 requests on Unix/Linux/Posix platforms as this is a privileged port number 

diff --git a/dcmqrdb/etc/dcmqrscp.cfg b/dcmqrdb/etc/dcmqrscp.cfg
index 9b9b94cae80f14edb8577ae6bf30f4b3b38c8d50..de9fb4df86193ffed624bfe056a1e20fad48c40a 100644 (file)
--- a/dcmqrdb/etc/dcmqrscp.cfg
+++ b/dcmqrdb/etc/dcmqrscp.cfg
@@ -10,6 +10,9 @@
 NetworkTCPPort  = 104
 MaxPDUSize      = 16384
 MaxAssociations = 16
+UserName        = "dcmtk"
+GroupName       = "dcmtk"
+
 #
 # UserName      = <not used>
 # GroupName     = <not used>
@@ -28,12 +31,13 @@ HostTable BEGIN
 # NOTE: in the current implementation you cannot substitute an IP address
 # for a hostname.
 #
-acme1           = (ACME1, acmehost1, 5678)
-acme2           = (ACME2, acmehost2, 5678)
-acmeCTcompany   = acme1, acme2
-united1         = (UNITED1, unitedhost1, 104)
-united2         = (UNITED2, unitedhost2, 104)
-unitedMRcompany = united1, united2
+# Example:
+#acme1           = (ACME1, acmehost1, 5678)
+#acme2           = (ACME2, acmehost2, 5678)
+#acmeCTcompany   = acme1, acme2
+#united1         = (UNITED1, unitedhost1, 104)
+#united2         = (UNITED2, unitedhost2, 104)
+#unitedMRcompany = united1, united2
 #
 HostTable END
 
@@ -51,8 +55,9 @@ VendorTable BEGIN
 #       VendorName = SymbolicName
 # The symbolic name should be defined in the HostTable.
 #
-"Acme CT Company"   = acmeCTcompany
-"United MR Company" = unitedMRcompany
+# Example:
+#"Acme CT Company"   = acmeCTcompany
+#"United MR Company" = unitedMRcompany
 #
 VendorTable END
 
@@ -70,8 +75,13 @@ AETable BEGIN
 #               Entry in HostTable                      |
 #               ANY
 #
-COMMON       /home/dicom/db/COMMON       R  (200, 1024mb) ANY
-ACME_STORE   /home/dicom/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany
-UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany
+# Example:
+#
+#ACME_STORE   /var/lib/dcmtk/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany
+#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany
+#
+# Uncomment and adjust the following lines for a common r/rw storage area:
+#READWRITE     /var/lib/dcmtk/db/READWRITE    RW (10, 1024mb)  ANY
+#READ          /var/lib/dcmtk/db/READ         R  (200, 1024mb) ANY
 #
 AETable END

diff --git a/debian/rules b/debian/rules
index e4ac67106f1c37f99c23b098b23c9880d0819cb7..051a00da2edf7d407b72847e15dabafdd475f0b9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 # needed for the tests 
-export DCMDICTPATH=dcmdata/data/dicom.dic 
+DEB_CONFIGURE_SCRIPT_ENV += DCMDICTPATH=dcmdata/data/dicom.dic 
 
 # deduce documentation option (build-indep target)
 ifeq "" "$(filter %-doc,$(shell dh_listpackages))"

diff --git a/ofstd/tests/toption.cc b/ofstd/tests/toption.cc
index 3a22fb781c7a43b640ae2a3fde6f1cdf56671976..bc96a574dabde42aae2c7a414dfb35396bff504f 100644 (file)
--- a/ofstd/tests/toption.cc
+++ b/ofstd/tests/toption.cc
@@ -17,6 +17,11 @@ OFTEST(ofstd_optional)
 
     OFoptional<int> o0( 3 ), o1, o2( OFnullopt );
 
+    COUT << OFalignof(OFoptional<char>) << ' ' << sizeof(OFoptional<char>) << OFendl;
+    COUT << OFalignof(OFoptional<short>) << ' ' << sizeof(OFoptional<short>) << OFendl;
+    COUT << OFalignof(OFoptional<float>) << ' ' << sizeof(OFoptional<float>) << OFendl;
+    COUT << OFalignof(long) << ' ' << sizeof(long) << ' ' << OFalignof(OFoptional<long>) << ' ' << sizeof(OFoptional<long>) << OFendl;
+
     OFCHECK( o0 && *o0 == 3 );
 
     OFCHECK( !o1 && !o2 );